demos: Update GtkGrid definitions in UI files

author Emmanuele Bassi <ebassi@gnome.org>

Thu, 4 Apr 2019 23:10:18 +0000 (00:10 +0100)

committer Emmanuele Bassi <ebassi@gnome.org>

Thu, 4 Apr 2019 23:12:26 +0000 (00:12 +0100)
author Emmanuele Bassi <ebassi@gnome.org>
Thu, 4 Apr 2019 23:10:18 +0000 (00:10 +0100)
committer Emmanuele Bassi <ebassi@gnome.org>
Thu, 4 Apr 2019 23:12:26 +0000 (00:12 +0100)
diff --git a/demos/gtk-demo/application.ui b/demos/gtk-demo/application.ui

index f4e82dbacdf90e0106be547a0749948ff07125a6..ecceb997dbcc10bcbc439e6c1bc9d5a474b9945b 100644 (file)
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <template class="DemoApplicationWindow" parent="GtkApplicationWindow">
      <property name="title" translatable="yes">Application Class</property>
@@ -32,11 +33,11 @@
                  <property name="action-name">win.logo</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkInfoBar" id="infobar">
@@ -63,11 +64,11 @@
                  </child>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkScrolledWindow">
@@ -79,20 +80,20 @@
                  <property name="buffer">buffer</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkStatusbar" id="status">
              <property name="hexpand">1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
-          </packing>
          </child>
        </object>
      </child>
diff --git a/demos/gtk-demo/appmenu.ui b/demos/gtk-demo/appmenu.ui

index 2d2997277d70910afd91d46d4275f5aeda3c6fca..5eb87c640de098c4df5bed1c790ce2e0556aad25 100644 (file)
--- a/demos/gtk-demo/appmenu.ui
+++ b/demos/gtk-demo/appmenu.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <menu id="appmenu">
      <section>
diff --git a/demos/gtk-demo/blendmodes.ui b/demos/gtk-demo/blendmodes.ui

index b735e7394f6d97f923cb8d5496d9b2b187855c5f..f80d7522d9d3f5ca6452381c1b32703a16068a9e 100644 (file)
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <requires lib="gtk+" version="3.20"/>
    <object class="GtkWindow" id="window">
@@ -16,11 +17,11 @@
              <style>
                <class name="dim-label"/>
              </style>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkScrolledWindow" id="scrolledwindow">
@@ -28,22 +29,22 @@
              <property name="vexpand">1</property>
              <property name="shadow-type">in</property>
              <property name="min-content-width">150</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkStackSwitcher">
              <property name="halign">center</property>
              <property name="hexpand">1</property>
              <property name="stack">stack</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkStack" id="stack">
@@ -66,53 +67,53 @@
                      <child>
                        <object class="GtkLabel">
                          <property name="label" translatable="yes">Duck</property>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkLabel">
                          <property name="label" translatable="yes">Background</property>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkImage">
                          <style>
                            <class name="duck"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkImage">
                          <style>
                            <class name="gradient"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkLabel">
                          <property name="label" translatable="yes">
  Blended picture</property>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
+                          <property name="column-span">2</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                        <property name="width">2</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkImage">
@@ -120,12 +121,12 @@ Blended picture</property>
                          <style>
                            <class name="blend0"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">3</property>
+                          <property name="column-span">2</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">3</property>
-                        <property name="width">2</property>
-                      </packing>
                      </child>
                    </object>
                  </property>
@@ -145,53 +146,53 @@ Blended picture</property>
                      <child>
                        <object class="GtkLabel">
                          <property name="label" translatable="yes">Red</property>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkLabel">
                          <property name="label" translatable="yes">Blue</property>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkImage">
                          <style>
                            <class name="red"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkImage">
                          <style>
                            <class name="blue"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkLabel">
                          <property name="label" translatable="yes">
  Blended picture</property>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
+                          <property name="column-span">2</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                        <property name="width">2</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkImage">
@@ -199,12 +200,12 @@ Blended picture</property>
                          <style>
                            <class name="blend1"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">3</property>
+                          <property name="column-span">2</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">3</property>
-                        <property name="width">2</property>
-                      </packing>
                      </child>
                    </object>
                  </property>
@@ -227,33 +228,33 @@ Blended picture</property>
                          <style>
                            <class name="cyan"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkImage">
                          <style>
                            <class name="magenta"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkImage">
                          <style>
                            <class name="yellow"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">3</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">3</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkImage">
@@ -261,11 +262,11 @@ Blended picture</property>
                          <style>
                            <class name="blend2"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">3</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">3</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkLabel">
@@ -274,11 +275,11 @@ Blended picture</property>
                          <style>
                            <class name="dim-label"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkLabel">
@@ -287,11 +288,11 @@ Blended picture</property>
                          <style>
                            <class name="dim-label"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkLabel">
@@ -300,11 +301,11 @@ Blended picture</property>
                          <style>
                            <class name="dim-label"/>
                          </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                      </packing>
                      </child>
                      <child>
                        <object class="GtkLabel">
@@ -313,21 +314,21 @@ Blended picture</property>
                          <attributes>
                            <attribute name="weight" value="bold"></attribute>
                          </attributes>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">2</property>
+                        </layout>
                        </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">2</property>
-                      </packing>
                      </child>
                    </object>
                  </property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
        </object>
      </child>
diff --git a/demos/gtk-demo/cursors.ui b/demos/gtk-demo/cursors.ui

index 6394f7e582024aaf5081cbc6f522c0256c9c4478..4b81bd9f5a5296ba4b0a877ab7e6fa54d59b9d04 100644 (file)
--- a/demos/gtk-demo/cursors.ui
+++ b/demos/gtk-demo/cursors.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GdkCursor" id="default_cursor">
      <property name="name">default</property>
diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui

index 7ee0fa245dcb4b63f866e8328a3a684438541d61..6fa269822edb52ce0b0c4a8359b4d1beb55ef1e1 100644 (file)
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkListStore" id="liststore1">
      <columns>
diff --git a/demos/gtk-demo/filtermodel.ui b/demos/gtk-demo/filtermodel.ui

index 73cfdeeb130158359dc49d76d90c722487cea3dd..aed068a19711ae8d17c3f88303aed143d9f4f4ac 100644 (file)
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <requires lib="gtk+" version="3.16"/>
    <object class="GtkListStore" id="liststore1">
@@ -44,11 +45,11 @@
              <accessibility>
                <relation type="label-for" target="treeview1"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkTreeView" id="treeview1">
@@ -83,11 +84,11 @@
              <accessibility>
                <relation type="labelled-by" target="label1"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkTreeView" id="treeview2">
@@ -134,11 +135,11 @@
              <accessibility>
                <relation type="labelled-by" target="label2"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="label2">
@@ -150,11 +151,11 @@
              <accessibility>
                <relation type="label-for" target="treeview2"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="label3">
@@ -166,11 +167,11 @@
              <accessibility>
                <relation type="label-for" target="treeview3"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkTreeView" id="treeview3">
@@ -199,11 +200,11 @@
              <accessibility>
                <relation type="labelled-by" target="label3"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
-          </packing>
          </child>
        </object>
      </child>
diff --git a/demos/gtk-demo/fishbowl.ui b/demos/gtk-demo/fishbowl.ui

index 02efcb42fbdea78840e9d0319828b79a741f8058..c6216666b634c388a9033985222470a1ecba63d9 100644 (file)
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkWindow" id="window">
      <property name="title" translatable="yes">Fishbowl</property>
@@ -27,25 +28,21 @@
            <object class="GtkLabel">
              <property name="label">fps</property>
            </object>
-          <packing/>
          </child>
          <child type="end">
            <object class="GtkLabel">
              <property name="label" bind-source="bowl" bind-property="framerate"/>
            </object>
-          <packing/>
          </child>
          <child type="end">
            <object class="GtkLabel">
              <property name="label">Icons, </property>
            </object>
-          <packing/>
          </child>
          <child type="end">
            <object class="GtkLabel">
              <property name="label" bind-source="bowl" bind-property="count"/>
            </object>
-          <packing/>
          </child>
          <child type="end">
            <object class="GtkToggleButton" id="changes_allow">
@@ -53,7 +50,6 @@
              <property name="icon-name">changes-allow</property>
              <property name="relief">none</property>
            </object>
-          <packing/>
          </child>
          <child type="end">
            <object class="GtkToggleButton" id="changes_prevent">
@@ -62,7 +58,6 @@
              <property name="icon-name">changes-prevent</property>
              <property name="relief">none</property>
            </object>
-          <packing/>
          </child>
        </object>
      </child>
diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui

index 29cb4af3c2aa794ad7b45ba4871aa1d32f705b75..dbde04bf0391414b3f90e821fb7ccf15e3877880 100644 (file)
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <requires lib="gtk+" version="3.12"/>
    <object class="GtkWindow" id="window">
diff --git a/demos/gtk-demo/listbox.ui b/demos/gtk-demo/listbox.ui

index 60c259a458b62b54c20046c0622796b65176ce3b..fa4a96df10fa0ab1c831c0500c2bb68ef3749829 100644 (file)
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface domain="gtk40">
    <object class="GtkMenu" id="menu1">
      <child>
@@ -28,12 +29,12 @@
              <property name="margin-start">8</property>
              <property name="margin-end">8</property>
              <property name="icon-name">image-missing</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+              <property name="row-span">5</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-            <property name="height">5</property>
-          </packing>
          </child>
          <child>
            <object class="GtkBox" id="box1">
@@ -74,11 +75,11 @@
                  </style>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="content_label">
@@ -91,11 +92,11 @@
              <accessibility>
                <role type="static"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkBox" id="resent_box">
@@ -118,11 +119,11 @@
                  <property name="uri">http://www.gtk.org</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkBox" id="box3">
@@ -181,11 +182,11 @@
                  </child>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">3</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">3</property>
-          </packing>
          </child>
          <child>
            <object class="GtkRevealer" id="details_revealer">
@@ -250,11 +251,11 @@ FAVORITES</property>
                  </child>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">4</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">4</property>
-          </packing>
          </child>
        </object>
      </child>
diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui

index 8ed41e366654d98d93ec98b2c40c07d003c58a70..59310762a99882da24ba4841e54becc5a11c3da9 100644 (file)
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkTreeStore" id="treestore">
      <columns>
diff --git a/demos/gtk-demo/menus.ui b/demos/gtk-demo/menus.ui

index ace0974da0ecf7b65144f03ce82103ae1a5b978e..d9572b9f39166b3af076ce0bc730c0445000affd 100644 (file)
--- a/demos/gtk-demo/menus.ui
+++ b/demos/gtk-demo/menus.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <menu id="appmenu">
      <section>
diff --git a/demos/gtk-demo/modelbutton.ui b/demos/gtk-demo/modelbutton.ui

index 2e7e11bec258535fbd9d28a6dbc349b9a487ec23..30a65e8fe13de7ec39ab6977fddc6866632566d1 100644 (file)
--- a/demos/gtk-demo/modelbutton.ui
+++ b/demos/gtk-demo/modelbutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkWindow" id="window1">
      <child type="titlebar">
diff --git a/demos/gtk-demo/popover.ui b/demos/gtk-demo/popover.ui

index 03ab8d966b6db7f6bdf2945082acb8a604611cef..956302d3a1fc0b502d8dcadc7ee4f468da3eb76e 100644 (file)
--- a/demos/gtk-demo/popover.ui
+++ b/demos/gtk-demo/popover.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkListStore" id="liststore1">
      <columns>
diff --git a/demos/gtk-demo/revealer.ui b/demos/gtk-demo/revealer.ui

index 850786cf6d892206850945b4714a9c166c1abfc8..3356658469b761f0aa8e4a92cfb9b2f1d632a3e9 100644 (file)
--- a/demos/gtk-demo/revealer.ui
+++ b/demos/gtk-demo/revealer.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkWindow" id="window">
      <property name="default-width">300</property>
@@ -17,11 +18,11 @@
                  <property name="icon-size">large</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkRevealer" id="revealer1">
@@ -33,11 +34,11 @@
                  <property name="icon-size">large</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkRevealer" id="revealer2">
@@ -49,11 +50,11 @@
                  <property name="icon-size">large</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">3</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">3</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkRevealer" id="revealer3">
@@ -64,11 +65,11 @@
                  <property name="icon-size">large</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">3</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">3</property>
-          </packing>
          </child>
          <child>
            <object class="GtkRevealer" id="revealer4">
@@ -80,11 +81,11 @@
                  <property name="icon-size">large</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkRevealer" id="revealer5">
@@ -96,11 +97,11 @@
                  <property name="icon-size">large</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkRevealer" id="revealer6">
@@ -112,11 +113,11 @@
                  <property name="icon-size">large</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">4</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">4</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkRevealer" id="revealer7">
@@ -127,11 +128,11 @@
                  <property name="icon-size">large</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">4</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">4</property>
-          </packing>
          </child>
          <child>
            <object class="GtkRevealer" id="revealer8">
@@ -143,11 +144,11 @@
                  <property name="icon-size">large</property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
        </object>
      </child>
diff --git a/demos/gtk-demo/scale.ui b/demos/gtk-demo/scale.ui

index 98fc717cfd24fe99fe974fe3192984b97f531aaa..b9c12059b9502236bef7bf54b2f55bd1a1346d33 100644 (file)
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkAdjustment" id="adjustment1">
      <property name="upper">4</property>
@@ -31,11 +32,11 @@
              <accessibility>
                <relation type="label-for" target="scale_plain"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkScale" id="scale_plain">
@@ -47,11 +48,11 @@
              <accessibility>
                <relation type="labelled-by" target="label_plain"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="label_marks">
@@ -60,11 +61,11 @@
              <accessibility>
                <relation type="label-for" target="scale_marks"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkScale" id="scale_marks">
@@ -83,11 +84,11 @@
              <accessibility>
                <relation type="labelled-by" target="label_marks"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="label_discrete">
@@ -96,11 +97,11 @@
              <accessibility>
                <relation type="label-for" target="scale_discrete"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkScale" id="scale_discrete">
@@ -120,11 +121,11 @@
                <mark value="3" position="bottom"/>
                <mark value="4" position="bottom"/>
              </marks>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
        </object>
      </child>
diff --git a/demos/gtk-demo/shortcuts-boxes.ui b/demos/gtk-demo/shortcuts-boxes.ui

index 72cb194f4b2c59844bf1f8881278d4c880079215..c55037a3894c28b9de14ec78bb823d15e17838f5 100644 (file)
--- a/demos/gtk-demo/shortcuts-boxes.ui
+++ b/demos/gtk-demo/shortcuts-boxes.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkShortcutsWindow" id="shortcuts-boxes">
      <property name="modal">1</property>
diff --git a/demos/gtk-demo/shortcuts-builder.ui b/demos/gtk-demo/shortcuts-builder.ui

index cfdaef7e2651abe5add61761bc1185f017f4ffb1..008859908f425c3a9cf643708c32371659226fdb 100644 (file)
--- a/demos/gtk-demo/shortcuts-builder.ui
+++ b/demos/gtk-demo/shortcuts-builder.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkShortcutsWindow" id="shortcuts-builder">
      <property name="modal">1</property>
diff --git a/demos/gtk-demo/shortcuts-clocks.ui b/demos/gtk-demo/shortcuts-clocks.ui

index f0eeea2d5bbd5e803f783fc8d67d1154cfa64500..c8066704a0a3c1dd324c218530a618a449c5af9c 100644 (file)
--- a/demos/gtk-demo/shortcuts-clocks.ui
+++ b/demos/gtk-demo/shortcuts-clocks.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkShortcutsWindow" id="shortcuts-clocks">
      <property name="modal">1</property>
diff --git a/demos/gtk-demo/shortcuts-gedit.ui b/demos/gtk-demo/shortcuts-gedit.ui

index 24129488712c094570f28d83f7d1f17e6d323b29..b745c3c11b7a9c7b257d3bb5818718626bba5c10 100644 (file)
--- a/demos/gtk-demo/shortcuts-gedit.ui
+++ b/demos/gtk-demo/shortcuts-gedit.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkShortcutsWindow" id="shortcuts-gedit">
      <property name="modal">1</property>
diff --git a/demos/gtk-demo/shortcuts.ui b/demos/gtk-demo/shortcuts.ui

index 5529fff4f3f1afe71439a4d463533212fff64d45..00b885efeb45945fcb6b62c275c796d78d7ead0e 100644 (file)
--- a/demos/gtk-demo/shortcuts.ui
+++ b/demos/gtk-demo/shortcuts.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkWindow" id="window1">
      <property name="title" translatable="yes">Shortcuts</property>
diff --git a/demos/gtk-demo/spinbutton.ui b/demos/gtk-demo/spinbutton.ui

index cd49a138d11a2ce6a59abfee06cba7ae19fb2d90..d14058430cd9cefa3f6fcfa58e44157375df45f4 100644 (file)
--- a/demos/gtk-demo/spinbutton.ui
+++ b/demos/gtk-demo/spinbutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkAdjustment" id="basic_adjustment">
      <property name="lower">-10000</property>
@@ -35,11 +36,11 @@
              <property name="use-underline">1</property>
              <property name="mnemonic-widget">basic_spin</property>
              <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkSpinButton" id="basic_spin">
@@ -49,21 +50,21 @@
              <property name="climb-rate">1</property>
              <property name="digits">2</property>
              <property name="numeric">1</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="basic_label">
              <property name="width-chars">10</property>
              <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel">
@@ -71,11 +72,11 @@
              <property name="use-underline">1</property>
              <property name="mnemonic-widget">hex_spin</property>
              <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkSpinButton" id="hex_spin">
@@ -85,21 +86,21 @@
              <signal name="input" handler="hex_spin_input"/>
              <signal name="output" handler="hex_spin_output"/>
              <property name="wrap">1</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="hex_label">
              <property name="width-chars">10</property>
              <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel">
@@ -107,11 +108,11 @@
              <property name="use-underline">1</property>
              <property name="mnemonic-widget">time_spin</property>
              <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkSpinButton" id="time_spin">
@@ -121,21 +122,21 @@
              <signal name="input" handler="time_spin_input"/>
              <signal name="output" handler="time_spin_output"/>
              <property name="wrap">1</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="time_label">
              <property name="width-chars">10</property>
              <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel">
@@ -143,11 +144,11 @@
              <property name="use-underline">1</property>
              <property name="mnemonic-widget">month_spin</property>
              <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
-          </packing>
          </child>
          <child>
            <object class="GtkSpinButton" id="month_spin">
@@ -158,21 +159,21 @@
              <property name="adjustment">month_adjustment</property>
              <property name="wrap">1</property>
              <property name="update-policy">if-valid</property>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">3</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">3</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="month_label">
              <property name="width-chars">10</property>
              <property name="xalign">1</property>
+            <layout>
+              <property name="left-attach">2</property>
+              <property name="top-attach">3</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">3</property>
-          </packing>
          </child>
        </object>
      </child>
diff --git a/demos/gtk-demo/stack.ui b/demos/gtk-demo/stack.ui

index 24b21b713ec0ad659b10f0f0eb700bda98ad7d76..adaccfd0195b0e766365c746887b94b417841d83 100644 (file)
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkWindow" id="window1">
      <property name="title" translatable="yes">Stack</property>
@@ -7,11 +8,11 @@
            <object class="GtkStackSwitcher">
              <property name="stack">stack</property>
              <property name="halign">center</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkStack" id="stack">
@@ -57,11 +58,11 @@
                  </property>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
        </object>
      </child>
diff --git a/demos/gtk-demo/theming.ui b/demos/gtk-demo/theming.ui

index 58fea8349525e30151d1049024ddcbc3ace49f4a..c2ee74eb7b00b14d33c1265462d0f607ed7e63de 100644 (file)
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="GtkGrid" id="grid">
      <property name="row-spacing">10</property>
diff --git a/demos/icon-browser/window.ui b/demos/icon-browser/window.ui

index 3b5d8b161db83dac7125d7755a8b56d79095fb32..b38cb5eb08c03fda3ad2bcf44b952c6eea0e02d6 100644 (file)
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <object class="IconStore" id="store"/>
    <object class="GtkTreeModelFilter" id="filter_model">
@@ -46,7 +47,6 @@
                </object>
              </child>
            </object>
-          <packing/>
          </child>
        </object>
      </child>
@@ -95,7 +95,6 @@
                        <object class="GtkCellRendererText" id="text_cell">
                          <property name="xpad">10</property>
                          <property name="ypad">10</property>
-                        <property name="xalign">0.5</property>
                        </object>
                      </child>
                    </object>
@@ -135,11 +134,11 @@
                  <accessibility>
                    <relation type="labelled-by" target="label1"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
              </child>
              <child>
                <object class="GtkImage" id="image2">
@@ -148,11 +147,11 @@
                  <accessibility>
                    <relation type="labelled-by" target="label2"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
              </child>
              <child>
                <object class="GtkImage" id="image3">
@@ -161,11 +160,11 @@
                  <accessibility>
                    <relation type="labelled-by" target="label3"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">1</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">1</property>
-              </packing>
              </child>
              <child>
                <object class="GtkImage" id="image4">
@@ -174,11 +173,11 @@
                  <accessibility>
                    <relation type="labelled-by" target="label4"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">3</property>
+                  <property name="top-attach">1</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">1</property>
-              </packing>
              </child>
              <child>
                <object class="GtkImage" id="image5">
@@ -187,11 +186,11 @@
                  <accessibility>
                    <relation type="labelled-by" target="label5"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">4</property>
+                  <property name="top-attach">1</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">1</property>
-              </packing>
              </child>
              <child>
                <object class="GtkImage" id="image6">
@@ -200,11 +199,11 @@
                  <accessibility>
                    <relation type="labelled-by" target="label6"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">5</property>
+                  <property name="top-attach">1</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">5</property>
-                <property name="top-attach">1</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel" id="label1">
@@ -217,11 +216,11 @@
                  <accessibility>
                    <relation type="label-for" target="image1"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">2</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel" id="label2">
@@ -234,11 +233,11 @@
                  <accessibility>
                    <relation type="label-for" target="image2"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">2</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel" id="label3">
@@ -251,11 +250,11 @@
                  <accessibility>
                    <relation type="label-for" target="image3"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">2</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">2</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel" id="label4">
@@ -268,11 +267,11 @@
                  <accessibility>
                    <relation type="label-for" target="image4"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">3</property>
+                  <property name="top-attach">2</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">3</property>
-                <property name="top-attach">2</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel" id="label5">
@@ -285,11 +284,11 @@
                  <accessibility>
                    <relation type="label-for" target="image5"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">4</property>
+                  <property name="top-attach">2</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">4</property>
-                <property name="top-attach">2</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel" id="label6">
@@ -302,11 +301,11 @@
                  <accessibility>
                    <relation type="label-for" target="image6"/>
                  </accessibility>
+                <layout>
+                  <property name="left-attach">5</property>
+                  <property name="top-attach">2</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">5</property>
-                <property name="top-attach">2</property>
-              </packing>
              </child>
            </object>
          </child>
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui

index 882a53a54853c5987c243c669956ed31e05dcd1d..aa61c3b0f7569117c4cf1172c71dc3ae144b8106 100644 (file)
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
  <interface>
    <menu id="gear_menu">
      <section>
@@ -593,32 +594,32 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                      <property name="label" translatable="yes">checkbutton</property>
                                      <property name="can-focus">1</property>
                                      <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkCheckButton" id="checkbutton2">
                                      <property name="label" translatable="yes">checkbutton</property>
                                      <property name="can-focus">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkCheckButton" id="checkbutton3">
                                      <property name="label" translatable="yes">checkbutton</property>
                                      <property name="inconsistent">1</property>
                                      <property name="can-focus">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">2</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">2</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkCheckButton" id="checkbutton4">
@@ -626,22 +627,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                      <property name="sensitive">0</property>
                                      <property name="can-focus">1</property>
                                      <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">3</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">3</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkCheckButton" id="checkbutton5">
                                      <property name="label" translatable="yes">checkbutton</property>
                                      <property name="sensitive">0</property>
                                      <property name="can-focus">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">4</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">4</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkCheckButton" id="checkbutton6">
@@ -649,22 +650,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                      <property name="sensitive">0</property>
                                      <property name="inconsistent">1</property>
                                      <property name="can-focus">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">5</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">5</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkRadioButton" id="radiobutton1">
                                      <property name="label" translatable="yes">radiobutton</property>
                                      <property name="can-focus">1</property>
                                      <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkRadioButton" id="radiobutton2">
@@ -672,11 +673,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                      <property name="can-focus">1</property>
                                      <property name="active">1</property>
                                      <property name="group">radiobutton1</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkRadioButton" id="radiobutton3">
@@ -685,11 +686,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                      <property name="can-focus">1</property>
                                      <property name="active">1</property>
                                      <property name="group">radiobutton1</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">2</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">2</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkRadioButton" id="radiobutton4">
@@ -697,11 +698,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                      <property name="sensitive">0</property>
                                      <property name="can-focus">1</property>
                                      <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">3</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">3</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkRadioButton" id="radiobutton5">
@@ -710,11 +711,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                      <property name="can-focus">1</property>
                                      <property name="active">1</property>
                                      <property name="group">radiobutton3</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">4</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">4</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkRadioButton" id="radiobutton6">
@@ -724,46 +725,47 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                      <property name="can-focus">1</property>
                                      <property name="active">1</property>
                                      <property name="group">radiobutton3</property>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">5</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">5</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkSpinner" id="spinner1">
                                      <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">2</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">2</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
                                  </child>
                                  <child>
-                                  <object class="GtkSpinner" id="spinner2"/>
-                                  <packing>
-                                    <property name="left-attach">2</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
+                                  <object class="GtkSpinner" id="spinner2">
+                                    <layout>
+                                      <property name="left-attach">2</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
+                                  </object>
                                  </child>
                                  <child>
                                    <object class="GtkSpinner" id="spinner3">
                                      <property name="active">1</property>
                                      <property name="sensitive">0</property>
+                                    <layout>
+                                      <property name="left-attach">2</property>
+                                      <property name="top-attach">3</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">2</property>
-                                    <property name="top-attach">3</property>
-                                  </packing>
                                  </child>
                                  <child>
                                    <object class="GtkSpinner" id="spinner4">
                                      <property name="sensitive">0</property>
+                                    <layout>
+                                      <property name="left-attach">2</property>
+                                      <property name="top-attach">4</property>
+                                    </layout>
                                    </object>
-                                  <packing>
-                                    <property name="left-attach">2</property>
-                                    <property name="top-attach">4</property>
-                                  </packing>
                                  </child>
                                </object>
                              </child>
@@ -1502,11 +1504,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                          <property name="valign">center</property>
                                          <property name="value">.5</property>
                                          <property name="halign">center</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                      </child>
                                      <child>
                                        <object class="GtkScaleButton" id="mic-button">
@@ -1520,11 +1522,11 @@ microphone-sensitivity-medium-symbolic</property>
                                          <property name="halign">center</property>
                                          <signal name="query-tooltip" handler="on_scale_button_query_tooltip" swapped="no"/>
                                          <signal name="value-changed" handler="on_scale_button_value_changed" swapped="no"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                        </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                      </child>
                                    </object>
                                  </child>
@@ -3193,20 +3195,20 @@ bad things might happen.</property>
                  <style>
                    <class name="dim-label"/>
                  </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
              </child>
              <child>
                <object class="GtkEntry" id="details_entry">
                  <property name="valign">baseline</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel">
@@ -3218,20 +3220,20 @@ bad things might happen.</property>
                  <style>
                    <class name="dim-label"/>
                  </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
              </child>
              <child>
                <object class="GtkEntry" id="more_details_entry">
                  <property name="valign">baseline</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel">
@@ -3243,22 +3245,22 @@ bad things might happen.</property>
                  <style>
                    <class name="dim-label"/>
                  </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">2</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
-              </packing>
              </child>
              <child>
                <object class="GtkScale" id="level_scale">
                  <property name="valign">baseline</property>
                  <property name="draw-value">0</property>
                  <property name="adjustment">adjustment1</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">2</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-              </packing>
              </child>
              <child>
                <object class="GtkLabel">
@@ -3270,21 +3272,21 @@ bad things might happen.</property>
                  <style>
                    <class name="dim-label"/>
                  </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">3</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">3</property>
-              </packing>
              </child>
              <child>
                <object class="GtkSwitch" id="mode_switch">
                  <property name="halign">start</property>
                  <property name="valign">baseline</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">3</property>
+                </layout>
                </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">3</property>
-              </packing>
              </child>
            </object>
          </child>
@@ -3342,11 +3344,11 @@ bad things might happen.</property>
              <accessibility>
                <relation type="label-for" target="open_popover_entry"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkLabel" id="description_label">
@@ -3356,11 +3358,11 @@ bad things might happen.</property>
              <accessibility>
                <relation type="label-for" target="open_popover_textview"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkScrolledWindow">
@@ -3377,11 +3379,11 @@ bad things might happen.</property>
                  </accessibility>
                </object>
              </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
          </child>
          <child>
            <object class="GtkEntry" id="open_popover_entry">
@@ -3389,11 +3391,11 @@ bad things might happen.</property>
              <accessibility>
                <relation type="labelled-by" target="title_label"/>
              </accessibility>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
          </child>
          <child>
            <object class="GtkButton" id="open_popover_button">
@@ -3405,11 +3407,11 @@ bad things might happen.</property>
              <style>
                <class name="suggested-action"/>
              </style>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
+            </layout>
            </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-          </packing>
          </child>
        </object>
      </child>
author	Emmanuele Bassi <ebassi@gnome.org>
	Thu, 4 Apr 2019 23:10:18 +0000 (00:10 +0100)
committer	Emmanuele Bassi <ebassi@gnome.org>
	Thu, 4 Apr 2019 23:12:26 +0000 (00:12 +0100)
demos/gtk-demo/application.ui		patch \| blob \| history
demos/gtk-demo/appmenu.ui		patch \| blob \| history
demos/gtk-demo/blendmodes.ui		patch \| blob \| history
demos/gtk-demo/cursors.ui		patch \| blob \| history
demos/gtk-demo/demo.ui		patch \| blob \| history
demos/gtk-demo/filtermodel.ui		patch \| blob \| history
demos/gtk-demo/fishbowl.ui		patch \| blob \| history
demos/gtk-demo/font-features.ui		patch \| blob \| history
demos/gtk-demo/listbox.ui		patch \| blob \| history
demos/gtk-demo/main.ui		patch \| blob \| history
demos/gtk-demo/menus.ui		patch \| blob \| history
demos/gtk-demo/modelbutton.ui		patch \| blob \| history
demos/gtk-demo/popover.ui		patch \| blob \| history
demos/gtk-demo/revealer.ui		patch \| blob \| history
demos/gtk-demo/scale.ui		patch \| blob \| history
demos/gtk-demo/shortcuts-boxes.ui		patch \| blob \| history
demos/gtk-demo/shortcuts-builder.ui		patch \| blob \| history
demos/gtk-demo/shortcuts-clocks.ui		patch \| blob \| history
demos/gtk-demo/shortcuts-gedit.ui		patch \| blob \| history
demos/gtk-demo/shortcuts.ui		patch \| blob \| history
demos/gtk-demo/spinbutton.ui		patch \| blob \| history
demos/gtk-demo/stack.ui		patch \| blob \| history
demos/gtk-demo/theming.ui		patch \| blob \| history
demos/icon-browser/window.ui		patch \| blob \| history
demos/widget-factory/widget-factory.ui		patch \| blob \| history